From 757b5c774a5773f55907be101335f115db28fddf Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Thu, 24 Nov 2022 13:01:41 -0700
Subject: [PATCH] fix document generation on fedora (#949)

* try to find common docbook url for fedora/ubuntu/homebrew catalogs.

* fedora builds

jing is broken on f32, remove it so it doesn't kill our document build.

add f37, with Qt5 because fedora doesn't have Qt6 webengine yet.
---
 .github/workflows/fedora.yml |  2 +-
 tools/Dockerfile_f32         |  2 +-
 tools/Dockerfile_f35         |  2 +-
 tools/Dockerfile_f37         | 22 ++++++++++++++++++++++
 tools/make_gpsbabel_doc.sh   |  4 ++--
 5 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 tools/Dockerfile_f37

diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
index 79c38dd14..555e042ed 100644
--- a/.github/workflows/fedora.yml
+++ b/.github/workflows/fedora.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         # version 32, though obsolete, uses Qt 5.14 so we keep it for that.
-        version: ['32', '35']
+        version: ['32', '35', '37']
     container:
       image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_f${{ matrix.version }}
       env:
diff --git a/tools/Dockerfile_f32 b/tools/Dockerfile_f32
index 87d96c4d8..df78264e1 100644
--- a/tools/Dockerfile_f32
+++ b/tools/Dockerfile_f32
@@ -16,7 +16,7 @@ RUN dnf install --assumeyes libusbx-devel zlib-devel shapelib-devel && \
 RUN dnf install --assumeyes qt5-qtbase-devel qt5-qtserialport-devel qt5-qtwebengine-devel qt5-linguist qt5-qttranslations && \
     dnf clean all
 # tools to build the docs
-RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl jing && \
+RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl docbook5-schemas && \
     dnf clean all
 # create a link as fedora uses the name qmake-qt5 for Qt5's qmake.
 RUN alternatives --install /usr/bin/qmake qt /usr/lib64/qt5/bin/qmake 100
diff --git a/tools/Dockerfile_f35 b/tools/Dockerfile_f35
index 1b0b05f58..c3fdea90b 100644
--- a/tools/Dockerfile_f35
+++ b/tools/Dockerfile_f35
@@ -16,7 +16,7 @@ RUN dnf install --assumeyes libusb1-devel zlib-devel shapelib-devel && \
 RUN dnf install --assumeyes qt5-qtbase-devel qt5-qtserialport-devel qt5-qtwebengine-devel qt5-linguist qt5-qttranslations && \
     dnf clean all
 # tools to build the docs
-RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl && \
+RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl docbook5-schemas && \
     dnf clean all
 # create a link as fedora uses the name qmake-qt5 for Qt5's qmake.
 RUN alternatives --install /usr/bin/qmake qt /usr/lib64/qt5/bin/qmake 100
diff --git a/tools/Dockerfile_f37 b/tools/Dockerfile_f37
new file mode 100644
index 000000000..dc90f8ccf
--- /dev/null
+++ b/tools/Dockerfile_f37
@@ -0,0 +1,22 @@
+# this file is used to build the image gpsbabel_build_environment used by travis.
+
+FROM fedora:37
+
+LABEL maintainer="https://github.com/tsteven4"
+
+WORKDIR /app
+
+# basic tools to build
+RUN dnf install --assumeyes git make valgrind diffutils findutils langpacks-en ninja-build && \
+    dnf clean all
+# libraries used by gpsbabel.  zlib and shapelib may or may not be used depending qmake options.
+RUN dnf install --assumeyes libusb1-devel zlib-devel shapelib-devel && \
+    dnf clean all
+# Qt used by gpsbabel, gpsbabelfe
+RUN dnf install --assumeyes qt5-qtbase-devel qt5-qtserialport-devel qt5-qtwebengine-devel qt5-linguist qt5-qttranslations && \
+    dnf clean all
+# tools to build the docs
+RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl docbook5-schemas && \
+    dnf clean all
+# create a link as fedora uses the name qmake-qt5 for Qt5's qmake.
+RUN alternatives --install /usr/bin/qmake qt /usr/lib64/qt5/bin/qmake 100
diff --git a/tools/make_gpsbabel_doc.sh b/tools/make_gpsbabel_doc.sh
index d639b7eef..61b8dcb93 100755
--- a/tools/make_gpsbabel_doc.sh
+++ b/tools/make_gpsbabel_doc.sh
@@ -2,9 +2,9 @@
 set -ex
 
 perl xmldoc/makedoc
-xmllint --noout --relaxng http://www.oasis-open.org/docbook/xml/5.0/rng/docbook.rng xmldoc/readme.xml
+xmllint --noout --relaxng http://docbook.org/xml/5.0/rng/docbook.rng xmldoc/readme.xml
 # the following doesn't seem to work.
-#xmllint --noout --schematron http://www.oasis-open.org/docbook/xml/5.0/sch/docbook.sch xmldoc/readme.xml
+#xmllint --noout --schematron http://docbook.org/xml/5.0/sch/docbook.sch xmldoc/readme.xml
 # jing and many depedencies removed from fedora
 if command -v jing >/dev/null 2>&1; then
   jing http://docs.oasis-open.org/docbook/xml/5.0/rng/docbook.rng xmldoc/readme.xml
-- 
2.30.2